Remove obsolete startNow() method from XmTestDomain object.

Signed-off-by: Daniel Stekloff <dsteklof@us.ibm.com>

diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py
index 6ffb4ffab76b25a9480505286107b1f65696f096..ec1e4ba7499a785d2c86d139a646a111074cc1ec 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/XenDomain.py
+++ b/tools/xm-test/lib/XmTestLib/XenDomain.py
@@ -251,9 +251,6 @@ class XmTestDomain(XenDomain):
         if ENABLE_HVM_SUPPORT:
             waitForBoot()
 
-    def startNow(self):
-        XenDomain.start(self)
-
     def minSafeMem(self):
         return 16
 

diff --git a/tools/xm-test/tests/create/10_create_fastdestroy.py b/tools/xm-test/tests/create/10_create_fastdestroy.py
index 7a43dccbd2fe8c2b32653ffc9694ee1eb0fb2926..f17d4502b999929d509699ce59c0dce837d606dc 100644 (file)
--- a/tools/xm-test/tests/create/10_create_fastdestroy.py
+++ b/tools/xm-test/tests/create/10_create_fastdestroy.py
@@ -28,7 +28,7 @@ i = 0
 for i in range(0,50):
     domain = XmTestDomain("testdomain")
     try:
-        domain.startNow()
+        domain.start()
     except DomainError,e:
         print "Failed: " + e.extra
         NSPerror = check_for_NSP_error(e.extra)

diff --git a/tools/xm-test/tests/destroy/07_destroy_stale_pos.py b/tools/xm-test/tests/destroy/07_destroy_stale_pos.py
index 29909ea73601e0c3c500b927653609716784ae52..9c5a69771f965d317fca5054b61f1fecd1ca6dd1 100644 (file)
--- a/tools/xm-test/tests/destroy/07_destroy_stale_pos.py
+++ b/tools/xm-test/tests/destroy/07_destroy_stale_pos.py
@@ -101,29 +101,24 @@ def test_sysrq(name):
     if not re.search("[Ee]rror", output):
         FAIL("sysrq failed to report error after destroy!")
 
-def runTests(tests, wait):
+def runTests(tests):
     for test in tests:
         domain = XmTestDomain()
 
         # Create a domain
 
         try:
-            if wait:
-                domain.start()
-            else:
-                domain.startNow()
+            domain.start()
         except DomainError, e:
             FAIL(str(e))
 
-
-        if wait:
-            # Attach a console and make sure it's live
-            try:
-                console = XmConsole(domain.getName())
-                console.sendInput("foo")
-                console.runCmd("ls")
-            except ConsoleError, e:
-                FAIL(str(e))
+        # Attach a console and make sure it's live
+        try:
+            console = XmConsole(domain.getName())
+            console.sendInput("foo")
+            console.runCmd("ls")
+        except ConsoleError, e:
+            FAIL(str(e))
 
         # Destroy it
                 
@@ -137,9 +132,5 @@ tests = [test_mem_set, test_pause, test_unpause, test_reboot, test_save,
          test_block_list, test_shutdown, test_domid, test_domname]
 
 if verbose:
-    print "Running stale tests (nice mode)"
-runTests(tests, True)
-
-if verbose:
-    print "Running stale tests (mean mode)"
-runTests(tests, False)
+    print "Running stale tests"
+runTests(tests)